From b15599e84f90232c80753fead201d50c89b5d159 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 4 Aug 2014 14:29:17 +0100 Subject: [PATCH] Makefile inclusion of Paths.mk should be conditional Since it may not exist when doing e.g. "make clean". There is existing logic in the makefiles which will raise an error if an actual build target is invoked without having run configure. Signed-off-by: Ian Campbell Cc: Luis R. Rodriguez Acked-by: Ian Jackson --- config/Stubdom.mk.in | 2 +- tools/Rules.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in index 6bce206050..c1c83bc206 100644 --- a/config/Stubdom.mk.in +++ b/config/Stubdom.mk.in @@ -1,5 +1,5 @@ # Prefix and install folder -include $(XEN_ROOT)/config/Paths.mk +-include $(XEN_ROOT)/config/Paths.mk prefix := @prefix@ PREFIX := $(prefix) exec_prefix := @exec_prefix@ diff --git a/tools/Rules.mk b/tools/Rules.mk index 0aa1e6bdc6..5bac700ee7 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -5,7 +5,7 @@ all: -include $(XEN_ROOT)/config/Tools.mk include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Paths.mk +-include $(XEN_ROOT)/config/Paths.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install -- 2.30.2